trunks: Uprev to libchrome r369476 libchrome is being updated to a new version and a number of APIs have changed. Updating the clients using those APIs... BUG=b/26772882 TEST=./build_packages --board={link|whirlwind} CQ-DEPEND=CL:323378 Change-Id: I3f5610f0fd1a0ce06990aa9447e6c67e2e987f09 Reviewed-on: https://chromium-review.googlesource.com/323434 Commit-Ready: Alex Vakulenko <avakulenko@google.com> Tested-by: Alex Vakulenko <avakulenko@google.com> Reviewed-by: Alex Deymo <deymo@chromium.org> Reviewed-by: Alex Vakulenko <avakulenko@google.com> diff --git a/tss/context_manager.h b/tss/context_manager.h index 1c2c0eb..c5836a8 100644 --- a/tss/context_manager.h +++ b/tss/context_manager.h
@@ -7,7 +7,7 @@ #include <map> #include <tr1/memory> -#include <base/basictypes.h> +#include <base/macros.h> #include "tss/tss_typedef.h" #include "tss/tss_error.h"
diff --git a/tss/resource_manager.h b/tss/resource_manager.h index 370c345..a442c60 100644 --- a/tss/resource_manager.h +++ b/tss/resource_manager.h
@@ -7,7 +7,7 @@ #include <map> -#include <base/basictypes.h> +#include <base/macros.h> #include "tss/tss_error.h" #include "tss/tss_typedef.h"
diff --git a/tss/resource_manager_mock.h b/tss/resource_manager_mock.h index cb345e5..5ca3bd0 100644 --- a/tss/resource_manager_mock.h +++ b/tss/resource_manager_mock.h
@@ -7,7 +7,7 @@ #include "resource_manager.h" -#include <base/basictypes.h> +#include <base/macros.h> #include <gmock/gmock.h> #include "tss/tss_error.h"
diff --git a/tss/stub_context.h b/tss/stub_context.h index b5f3048..352e952 100644 --- a/tss/stub_context.h +++ b/tss/stub_context.h
@@ -7,7 +7,7 @@ #include <map> -#include <base/basictypes.h> +#include <base/macros.h> #include "tss/tss_error.h" #include "tss/tss_typedef.h"
diff --git a/tss/tcs.h b/tss/tcs.h index 825c10d..6ca3aa4 100644 --- a/tss/tcs.h +++ b/tss/tcs.h
@@ -5,7 +5,7 @@ #ifndef TRUNKS_TSS_TCS_H_ #define TRUNKS_TSS_TCS_H_ -#include <base/basictypes.h> +#include <base/macros.h> #include "context_manager.h" #include "tcs_context.h"
diff --git a/tss/tcs_context.h b/tss/tcs_context.h index edf930c..096f32a 100644 --- a/tss/tcs_context.h +++ b/tss/tcs_context.h
@@ -7,7 +7,7 @@ #include <map> -#include <base/basictypes.h> +#include <base/macros.h> #include "resource_manager.h" #include "tss/tss_error.h"
diff --git a/tss/tpm.h b/tss/tpm.h index e8857a8..b8c6175 100644 --- a/tss/tpm.h +++ b/tss/tpm.h
@@ -6,7 +6,7 @@ #define TRUNKS_TSS_TPM_H_ #include <vector> -#include <base/basictypes.h> +#include <base/macros.h> #include "tss/tss_typedef.h" #include "tpm_constants.h"
diff --git a/tss/tpm_message.h b/tss/tpm_message.h index bb2dbc9..7308f30 100644 --- a/tss/tpm_message.h +++ b/tss/tpm_message.h
@@ -5,7 +5,7 @@ #ifndef TRUNKS_TSS_TPM_MESSAGE_H_ #define TRUNKS_TSS_TPM_MESSAGE_H_ -#include <base/basictypes.h> +#include <base/macros.h> #include <stdint.h> #include <stddef.h>
diff --git a/tss/trunks_dbus_client.h b/tss/trunks_dbus_client.h index 9ec0130..8f8c5d6 100644 --- a/tss/trunks_dbus_client.h +++ b/tss/trunks_dbus_client.h
@@ -5,7 +5,7 @@ #ifndef TRUNKS_DBUS_CLIENT_H_ #define TRUNKS_DBUS_CLIENT_H_ -#include <base/basictypes.h> +#include <base/macros.h> #include <base/memory/scoped_ptr.h> namespace trunks { diff --git a/tss/trunks_dbus_service.h b/tss/trunks_dbus_service.h index 5e0291f..19ccb2a 100644 --- a/tss/trunks_dbus_service.h +++ b/tss/trunks_dbus_service.h
@@ -5,7 +5,7 @@ #ifndef TRUNKS_DBUS_SERVICE_H_ #define TRUNKS_DBUS_SERVICE_H_ -#include <base/basictypes.h> +#include <base/macros.h> #include "trunks_dbus_adaptor_generated.h"
diff --git a/tss/tsp.h b/tss/tsp.h index fe6ded7..8f09af0 100644 --- a/tss/tsp.h +++ b/tss/tsp.h
@@ -5,7 +5,7 @@ #ifndef TRUNKS_TSS_TSP_H_ #define TRUNKS_TSS_TSP_H_ -#include <base/basictypes.h> +#include <base/macros.h> #include "context_manager.h" #include "context_manager_tsp_mock.h"
diff --git a/tss/tsp_context.h b/tss/tsp_context.h index 1ac765c..9399098 100644 --- a/tss/tsp_context.h +++ b/tss/tsp_context.h
@@ -6,7 +6,7 @@ #define TRUNKS_TSS_TSP_CONTEXT_H_ #include <map> -#include <base/basictypes.h> +#include <base/macros.h> #include "resource_manager.h" #include "tss/tss_error.h"
